Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #29133 to 7.17 #33165

Merged
merged 12 commits into from
Sep 29, 2022
Merged

Backport #29133 to 7.17 #33165

merged 12 commits into from
Sep 29, 2022

Conversation

MichaelKatsoulis
Copy link
Contributor

@MichaelKatsoulis MichaelKatsoulis commented Sep 22, 2022 •
edited
Loading

Backporting #29133 to 7.17 as per #33108

@MichaelKatsoulis MichaelKatsoulis requested review from a team as code owners September 22, 2022 10:47
@MichaelKatsoulis MichaelKatsoulis requested review from michalpristas, blakerouse, faec and leehinman and removed request for a team September 22, 2022 10:47
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 22, 2022
@MichaelKatsoulis MichaelKatsoulis marked this pull request as draft September 22, 2022 10:47
@MichaelKatsoulis MichaelKatsoulis added the Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team label Sep 22, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 22, 2022
@MichaelKatsoulis MichaelKatsoulis requested review from a team and removed request for a team, michalpristas, blakerouse, faec and leehinman September 22, 2022 10:48
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 22, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-09-28T11:59:49.837+0000

  • Duration: 129 min 33 sec

Test stats 🧪

Test Results
Failed 0
Passed 21572
Skipped 1419
Total 22991

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@MichaelKatsoulis MichaelKatsoulis marked this pull request as ready for review September 23, 2022 09:38
ChrsMark
ChrsMark approved these changes Sep 23, 2022
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm.

I see the number of lines' diff is different compared to #29133. Consider having a look into the diffs so as to make sure the backport did not miss any important line from the original PR.

@MichaelKatsoulis
Copy link
Contributor Author

I see the number of lines' diff is different compared to #29133.

@ChrsMark that is because this is not a blind backport. Some things added in #29133 where relevant to pre-existing features in 8.1 branch like the #28521 or the named watchers.

I tried to keep only the bare minimum which is the enrichment with namespace and node labels and annotations.

@MichaelKatsoulis
Copy link
Contributor Author

/test

@MichaelKatsoulis
Copy link
Contributor Author

/package

@MichaelKatsoulis
Copy link
Contributor Author

/test

@MichaelKatsoulis MichaelKatsoulis merged commit 891b217 into elastic:7.17 Sep 29, 2022
@skakauridze-clgx
Copy link

Is this backport for only 7.17.0, or for other patch versions as well? E.g 7.17.6?

@skakauridze-clgx
Copy link

What is the plan for releasing this merge?

This was referenced May 12, 2023
Open
Merged
@tetianakravchenko tetianakravchenko mentioned this pull request Nov 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

@gizas gizas gizas approved these changes

@tetianakravchenko tetianakravchenko Awaiting requested review from tetianakravchenko

Assignees

@MichaelKatsoulis MichaelKatsoulis

Labels
Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MichaelKatsoulis @elasticmachine @skakauridze-clgx @gizas @ChrsMark